Commits
- Commit:
d64cc78a320df6e371662d50eba6332a7be001c6
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got rm' behave like rm(1) for paths found missing on disk
ok millert@
- Commit:
48b4f239031ad66225f64bd6745f4a57a35c3a0f
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
wrap overlong lines
- Commit:
fc63f50d9b54fdd7a892d5a770542bdb07fb05d1
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add O_CLOEXEC (close-on-exec) to openat(2) calls
suggested by millert
ok thomas_adam
- Commit:
063406214771fb1483c7582bc7bd45f5d6b26c48
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add O_CLOEXEC (close-on-exec) flag to open(2) calls
suggested by millert
ok thomas_adam
- Commit:
c56c5d8a20e8209334b5357111eddee0861cddae
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add "e" (close-on-exec) flag to fopen(3) calls
suggested by millert
ok thomas_adam
- Commit:
c3741b5125b549780b75d4614d6dc283e53bd48d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
fix NULL dereference in 'got clone' if server sends an empty pack file
- Commit:
a0b48eaf75ca2f2a41f476012474a3d255c2e83d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got branch -t option to sort listed branches by modification time
- Commit:
2bf0fa54a55e054ffe4c688f49ecbd6a28101fe0
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add got ref -t option to sort listed references by modification time
- Commit:
82d979c595ed3516ee1dbff4500ccd8cf84848ce
- From:
- Josh Rickmar <jrick@zettaport.com>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
switch branches during noop rebases
Always update to the specified branch even if the branch is already
rebased (no commits needed to be rebased, and the branch does not need
a fast forward). With the old behavior of erroring and staying on the
current branch, I sometimes found myself ignoring the error message,
treating it as information and assuming the branch update, and later
on committing on top of origin/main instead of the main branch.
feedback and ok stsp
- Commit:
f1417e9f1c817d4e11dba207cf39ae12ffda2138
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
sort and de-duplicate work tree path command line arguments
This is important in cases like 'got diff file.txt file.txt' which
should only show the diff for file.txt once.
suggested by kn@
- Commit:
2777a00400ba964b25ac62b33acdd6677af6ae80
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
align 'diff -c' usage help with synopsis given in man page; suggested by naddy
- Commit:
cc8021afc28da386d1cab85b4d74b632b90e0108
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got diff -c' for diffing commits with optional filtering by path
Need for filtering by path sugggested by kn@
ok naddy@
- Commit:
238050ce7b9ba6527d21b357cea92a51d94d39cc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
remove code which was setting up repo_path redundantly from cmd_diff()
- Commit:
30f6c0c64b5c08d79e22cc2c0bd1f1340288a7f5
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add support for multiple path arguments to 'got diff'
positive feedback from Omar and kn
ok kn
- Commit:
d52bac284bc87b2e54ff8afd22886a7260f68b26
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
ignore unversioned files while aborting rebase, histedit, merge or operations
ok jrick
- Commit:
c50a74557db04e5ab02a1b0c53cb4fbdd64088ac
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
add histedit -e option which runs the 'edit' script command for every commit
ok jrick
- Commit:
dddbe150a21f404e9c42033d9b00b5561001df7e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got histedit' upon missing/unversioned/not-deleted files
- Commit:
bb494413b7b04767e20fc5a04378d517cda008ad
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
- Commit:
ba1629912dc172d6dfe5d0c09cb1e60c15c01899
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make 'got merge' interrupt the merge upon undeleted and unversioned files
- Commit:
0ef688596bd8c81c1cf6abdee7aedc07e1cbcbbc
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
print additional stats about things that went wrong during a merge
- Commit:
ae1e948a3179529896cf69272a0c1b45ab8ced1c
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
show commit progress output when 'got merge -c' is used
Otherwise no progress output is shown at all with this command.
Commit progress output will also display any additional changes
which resulted from conflict resolution.
ok millert@
- Commit:
ba34626bc13877c93836c8ee873acf1be8429ead
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
implement 'got merge -n' which interrupts before creating a merge commit
- Commit:
768705e331a0ff020ecc806142aecdecdbfb2e89
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
make it possible to merge vendor branches with 'got merge'
- Commit:
3dc1dc04a5ecf97ba3ce3f8c103c73bcfe00e31e
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
for portability, handle errno variations upon open(2) failure with O_NOFOLLOW
Problem pointed out by naddy for FreeBSD -portable.
Discussed with millert, thomas adam, and naddy.
- Commit:
88d249c247d1925b032b3d0b1ce8cac6aa7d1a6d
- From:
- Stefan Sperling <stsp@stsp.name>
- Via:
- Thomas Adam <thomas@xteddy.org>
- Date:
stop caring about obstructed versioned files in 'got merge'
Tyring to write a test to cover this case I found that obstructed files
are (correctly) detected as local modifications in the work tree. Thus
they trigger the pre-condition check for local modications and 'got merge'
will not even start to do any work in the presence of obstructed files.