Commits
- Commit:
35d2583f834a66f801dc229002d45e735882ba78- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
allow no-op merge commits to be created
Requested by James Cook
- Commit:
2b70695630ead3274d31727f6b477f3544dc9c9a- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix 'got commit' using a bad parent commit ID when worktree is out-of-date
Problem reported by James Cook with reproduction scripts
Regression test case by jamsek, as a simplified version of James' scripts
fix tested + ok jamsek
- Commit:
af179be739cacd6576fdf9596ac7e61b714ee367- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
when aborting rebase/histedit/merge, unlink files added by merged changes
Otherwise we leave unversioned files behind in the work tree which may
interfere with new attempts to rebase or merge the changes again.
Problem found by + ok naddy@
- Commit:
46108e23186237cccae84d88785fd31d692ef535- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
style nits from op@, thanks!
- Commit:
31cf15ecf83c7e0bf2e99599b19f43fe2435d75a- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
make 'got revert' and 'got rm' work on non-existent directories
problem found by robert@
ok jamsek, op
- Commit:
1b093d84c1f8f17f66aec3a337a121edcc6f77d9- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
fix rebase/histedit -a leaving some files on the temporary branch
The commands 'got rebase -a' and 'got histedit -a' were checking out
files from the wrong commit. Make them check files out from the commit
we are switching the work tree to, as intended.
Avoids spurious merge conflicts when the work tree is later used for
another rebase operation. It also makes 'got update' right after
'rebase -a' a no-op, as it should be.
Problem found by naddy@ while rebasing jca's llvm15 branch
ok op, jamsek earlier version
- Commit:
fd785a9ac70d88714b1d0533768076bcf5c9c2d2- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
update the base commit ID of unmodified files if the blob ID matches
This avoids having to run 'got update' after operations which run
checkout_files() and where a file happens to have the same blob ID
but its base commit differs from the commit we are updating to.
Found while investigating a bug report by naddy@
ok op, jamsek (earlier version)
- Commit:
07fa936579660934e2b84e747df1d21810278e11- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
handle files changing into directories during 'got update'
problem found by naddy@
- Commit:
9a298e5c10f6c68afbaca853454de2787a312c81- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
support histedit fold operations which delete a file and then add it again
problem found by naddy@
ok op@
- Commit:
53bf0b541977b66862040d4b633fb6b5d3a3c6c8- From:
- Omar Polo <op@omarpolo.com>
- Date:
rename lib/sha1.c to lib/hash.c
It will soon grow functions to deal with sha256 too. stsp@ agrees.
- Commit:
5822e79e39a8777984e08b5d89a8c55d6aa0356d- From:
- Omar Polo <op@omarpolo.com>
- Date:
include sha2.h too where sha1.h is included
In preparation for wide sha256 support; stsp@ agrees. Change done
mechanically with
find . -iname \*.[cy] -exec sam {} +
X ,x/<sha1\.h>/i/\n#include <sha2.h>
- Commit:
45e6b2f427b11e0fc760c10ee96eae3a6a5f06e7- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
use newly publicised diff_chunk_type() diff API
To skip chunks without newly added lines.
ok stsp@
- Commit:
249b637c505366856603a932c859a0baf1973d10- From:
- Stefan Sperling <stsp@stsp.name>
- Date:
have ignore patterns with trailing slashes match directories only
ok jamsek
- Commit:
2262237761cd6c8c89a4d4263a8d9c05a7a81d70- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
zap no longer needed forward declaration spotted by stsp@
- Commit:
7783f73c4beef7010e3332dee7f94dad9a54109f- From:
- Mark Jamsek <mark@jamsek.dev>
- Date:
use chunk offset to efficiently detect conflict markers
Rather than skip lines, use the new diff APIs to directly seek to each
chunk with newly added lines for more efficient conflict marker detection.
ok stsp@