| commit | 135be1ee2b6cc5b006974e38111990f0e22accd5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Sep 2013 22:02:29 +0000 (11 15:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Sep 2013 22:02:29 +0000 (11 15:02 -0700) | ||
| tree | 9cc41fea9f2b1d56c78916a23ceca4ddcf393e4b | treesnapshot (tar.gz zip) |
| parent | 8c731e9c8f92b138c31a0897321a2578ba9221e5 | commitdiff |
| parent | 75c69766554c4b34ede65502d481dd7beb7f3388 | commitdiff |
Merge branch 'es/rebase-i-no-abbrev'
The commit object names in the insn sheet that was prepared at the
beginning of "rebase -i" session can become ambiguous as the
rebasing progresses and the repository gains more commits. Make
sure the internal record is kept with full 40-hex object names.
* es/rebase-i-no-abbrev:
rebase -i: fix short SHA-1 collision
t3404: rebase -i: demonstrate short SHA-1 collision
t3404: make tests more self-contained
The commit object names in the insn sheet that was prepared at the
beginning of "rebase -i" session can become ambiguous as the
rebasing progresses and the repository gains more commits. Make
sure the internal record is kept with full 40-hex object names.
* es/rebase-i-no-abbrev:
rebase -i: fix short SHA-1 collision
t3404: rebase -i: demonstrate short SHA-1 collision
t3404: make tests more self-contained
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |