undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/rebase-recreate-merge'

Browse Source 
Hotfixes.

* js/rebase-recreate-merge:
  sequencer: ensure labels that are object IDs are rewritten
  git-rebase--interactive: fix copy-paste mistake
This commit is contained in:
Junio C Hamano 2018-06-01 15:06:40 +09:00
commit 95dd4b2b14
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase--interactive.sh
View File

@ -162,7 +162,7 @@ r, reword <commit> = use commit, but edit the commit message
e, edit <commit> = use commit, but stop for amending e, edit <commit> = use commit, but stop for amending
s, squash <commit> = use commit, but meld into previous commit s, squash <commit> = use commit, but meld into previous commit
f, fixup <commit> = like \"squash\", but discard this commit's log message f, fixup <commit> = like \"squash\", but discard this commit's log message
x, exec <commit> = run command (the rest of the line) using shell x, exec <command> = run command (the rest of the line) using shell
d, drop <commit> = remove commit d, drop <commit> = remove commit
l, label <label> = label current HEAD with a name l, label <label> = label current HEAD with a name
t, reset <label> = reset HEAD to a label t, reset <label> = reset HEAD to a label

2
sequencer.c
View File

@ -3792,7 +3792,7 @@ static const char *label_oid(struct object_id *oid, const char *label,
p[i] = save; p[i] = save;
} }
} }
} else if (((len = strlen(label)) == GIT_SHA1_RAWSZ && } else if (((len = strlen(label)) == the_hash_algo->hexsz &&
!get_oid_hex(label, &dummy)) || !get_oid_hex(label, &dummy)) ||
(len == 1 && *label == '#') || (len == 1 && *label == '#') ||
hashmap_get_from_hash(&state->labels, hashmap_get_from_hash(&state->labels,

17
t/t3430-rebase-merges.sh
View File

@ -70,6 +70,7 @@ test_expect_success 'create completely different structure' '
merge -C H second merge -C H second
merge onebranch # Merge the topic branch '\''onebranch'\'' merge onebranch # Merge the topic branch '\''onebranch'\''
EOF EOF
cp script-from-scratch script-from-scratch-orig &&
test_config sequence.editor \""$PWD"/replace-editor.sh\" && test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_tick && test_tick &&
git rebase -i -r A && git rebase -i -r A &&
@ -313,4 +314,20 @@ test_expect_success 'A root commit can be a cousin, treat it that way' '
EOF EOF
' '
test_expect_success 'labels that are object IDs are rewritten' '
git checkout -b third B &&
test_tick &&
test_commit I &&
third=$(git rev-parse HEAD) &&
git checkout -b labels master &&
git merge --no-commit third &&
test_tick &&
git commit -m "Merge commit '\''$third'\'' into labels" &&
cp script-from-scratch-orig script-from-scratch &&
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_tick &&
git rebase -i -r A &&
! grep "^label $third$" .git/ORIGINAL-TODO
'
test_done test_done