sequencer: ensure labels that are object IDs are rewritten
When writing the todo script for --rebase-merges, we try to find a label for certain commits. If the label ends up being a valid object ID, such as when we merge a detached commit, we want to rewrite it so it is no longer a valid object ID. However, the code path that does this checks for its length to be equivalent to GIT_SHA1_RAWSZ, which isn't correct, since what we are reading is a hex object ID. Instead, check for the length being equivalent to that of a hex object ID. Use the_hash_algo so this code works regardless of the hash size. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
May 29, 2018 at 16:32 UTC
5971b0836eece0ffcafe15fd5d67934787ea1777
2 files changed
+18
-1
sequencer.c
+1
-1
@@ -3534,7 +3534,7 @@ static const char *label_oid(struct object_id *oid, const char *label,
3534
p[i] = save;
3535
}
3536
}
3537
- } else if (((len = strlen(label)) == GIT_SHA1_RAWSZ &&
3537
+ } else if (((len = strlen(label)) == the_hash_algo->hexsz &&
3538
!get_oid_hex(label, &dummy)) ||
3539
(len == 1 && *label == '#') ||
3540
hashmap_get_from_hash(&state->labels,
t/t3430-rebase-merges.sh
+17
@@ -70,6 +70,7 @@ test_expect_success 'create completely different structure' '
70
merge -C H second
71
merge onebranch # Merge the topic branch '\''onebranch'\''
72
EOF
73
+ cp script-from-scratch script-from-scratch-orig &&
74
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
75
test_tick &&
76
git rebase -i -r A &&
@@ -241,4 +242,20 @@ test_expect_success 'refuse to merge ancestors of HEAD' '
242
test_cmp_rev HEAD $before
243
'
244
245
+test_expect_success 'labels that are object IDs are rewritten' '
246
+ git checkout -b third B &&
247
+ test_tick &&
248
+ test_commit I &&
249
+ third=$(git rev-parse HEAD) &&
250
+ git checkout -b labels master &&
251
+ git merge --no-commit third &&
252
+ test_tick &&
253
+ git commit -m "Merge commit '\''$third'\'' into labels" &&
254
+ cp script-from-scratch-orig script-from-scratch &&
255
+ test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
256
+ test_tick &&
257
+ git rebase -i -r A &&
258
+ ! grep "^label $third$" .git/ORIGINAL-TODO
259
+'
260
+
261
test_done