Commits

Commit:
69c6accf47680d70def917cbab0e761177d8264b
From:
Omar Polo <op@omarpolo.com>
Date:
include sha2.h where sha1.h was included
diff | patch | tree
Commit:
c33c3763d3c9e005bb51d9d3a6aab3bedc50bf2e
From:
Mark Jamsek <mark@jamsek.dev>
Date:
fix mistaken instances returning NULL instead of err While here, for consistency, check dup() return value for -1 rather than < 0. ok stsp@
diff | patch | tree
Commit:
ddb2df58a374b7058f0d3044c25b821680bd3345
From:
Mark Jamsek <mark@jamsek.dev>
Date:
got: make fetch default to the work tree's current branch As per stsp's todo item, if invoked in a work tree, make 'got fetch' default to fetching the work tree's current branch instead of the branch pointed to by the remote repository's HEAD. ok stsp@ and op@
diff | patch | tree
Commit:
ef85a376d8f41068fa9c6b11bc1fff98e3e9520c
From:
Mark Jamsek <mark@jamsek.dev>
Date:
zap unused parameter in got_worktree_rebase_complete() ok stsp@
diff | patch | tree
Commit:
36fdf003886958dce2c912acd082b3e9cfe88979
From:
Mark Jamsek <mark@jamsek.dev>
Date:
return err instead of NULL in got.c:print_backup_ref() ok stsp@
diff | patch | tree
Commit:
3506a2b1c255a8d362e1cce0a8b594c9fb17bb37
From:
Mark Jamsek <mark@jamsek.dev>
Date:
free cwd in cmd_backout() and cmd_cherrypick() ok stsp@
diff | patch | tree
Commit:
980c6786a419950816c67eb1b53e021ebdfe483c
From:
Stefan Sperling <stsp@stsp.name>
Date:
make 'got rebase' work when the to-be-rebased branch has no parent commit found by and ok op@, who also provided the test case
diff | patch | tree
Commit:
b584caa3e8756aeac18e4d5b3c63cdc8b17ad9ea
From:
Mark Jamsek <mark@jamsek.dev>
Date:
show worktree UUID in backout/cherrypick -l output When run from the repository, display the UUID to help the user know which logmsg refs belong to which work tree. Also, use "backout" or "cherrypick" in the log message header to distinguish output from 'got log'. Suggested by stsp on irc. ok stsp@
diff | patch | tree
Commit:
66c06eb12bec7b816963355327e0b3b53db5e881
From:
Mark Jamsek <mark@jamsek.dev>
Date:
add missed option conflict check for histedit -e and -f Reviewed as part of previous commit adding histedit -d. ok stsp@
diff | patch | tree
Commit:
f1c9fe20d35f9b64cee89491805039b13c91c8de
From:
Mark Jamsek <mark@jamsek.dev>
Date:
got: add 'got histedit -d' flag to drop all commits Like -f, except drop all commits. Discussed with op and stsp on irc. ok stsp@
diff | patch | tree
Commit:
7e320d3b050a09132d29db243fa3940d96707346
From:
Mark Jamsek <mark@jamsek.dev>
Date:
got: don't leave tmp "got-logmsg-*" files in the work tree Reported by stsp on irc, and reviewed as part of the following regress commit covering the commit aspect of logmsg refs. Delete temp merge_log files if created during commits involving backed-out/cherrypicked changes. ok stsp@
diff | patch | tree
Commit:
cf847b167995f9c334ac203d4817d0203a222756
From:
Stefan Sperling <stsp@stsp.name>
Date:
abort commit with merged log messages if the log message is left unmodified ok op@
diff | patch | tree
Commit:
c7ee7a0aebd0cf0ba96bd4215bd263d8f1dd8e6b
From:
Stefan Sperling <stsp@stsp.name>
Date:
avoid creation of temporary file if no merged log messages will be used
diff | patch | tree
Commit:
8b3ae425fe39895d4f5d1be49b178703173e964d
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename a variable for clarity
diff | patch | tree
Commit:
378a2540886d76e663ffc65125a68c08f8a38604
From:
Stefan Sperling <stsp@stsp.name>
Date:
uppercase cherrypick/backout -X progress output ok jamsek
diff | patch | tree