Commits

Commit:
b2b3fce13e4eca588bb28a869b07f0063568b505
From:
Omar Polo <op@omarpolo.com>
Date:
respect umask when creating or changing files and directories This behaviour is already documented in got-worktree(5) but wasn't actually implemented. ok stsp@
diff | patch | tree
Commit:
2c75f174eaa5edecfcf15dd4e81c87a70c53b21e
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
rebase.sh: remove accidentally included absolute path to "got"
diff | patch | tree
Commit:
0a706d22c0eedf209fc5cc5821872ac9b47ecfd4
From:
Stefan Sperling <stsp@stsp.name>
Date:
add regression test which covers fast-forward rebase + path-prefix
diff | patch | tree
Commit:
442ede73eadb025cdc45bede186bf31aee869dad
From:
Stefan Sperling <stsp@stsp.name>
Date:
forbid rebase of references outside the refs/heads/ namespace ok jrick
diff | patch | tree
Commit:
5e91dae4dd43b8024731223110ab18f505f453ac
From:
Josiah Frentsos <jfrent@tilde.team>
Via:
Stefan Sperling <stsp@stsp.name>
Date:
remove trailing whitespace; patch by Josiah Frentsos
diff | patch | tree
Commit:
1004841d7c8045b627768a441ebdb9c824d2134d
From:
Omar Polo <op@omarpolo.com>
Date:
don't undef GOT_AUTHOR in regress unset only in the subshell so further cose is unaffected. ok stsp@
diff | patch | tree
Commit:
50e7a649ac62e04706162f1e9b7b37e7485fc7ca
From:
Stefan Sperling <stsp@stsp.name>
Date:
do not require local author info during 'got rebase' My commit to reset committer info during rebase was too strict in some use cases. Even when simply forwarding a branch the rebase operation could now fail if GOT_AUTHOR is not set. To fix this, fall back on existing commiter information if no author is configured. And try to obtain author info from Git config in case GOT_AUTHOR is not set. Problems reported by Mikhail.
diff | patch | tree
Commit:
598eac4331d322ab9e91ee6864c54845e3a6e86c
From:
Stefan Sperling <stsp@stsp.name>
Date:
reset committer during rebase and histedit ok op@
diff | patch | tree
Commit:
67ba61612157092fbe0f8c4a02b60faf31967061
From:
Stefan Sperling <stsp@stsp.name>
Date:
leave work tree in a usable state after 'got rebase' fails path-prefix checks reported by naddy
diff | patch | tree
Commit:
49c543a6fe888394ca86e6399c706a9965486134
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
use test(1) -eq and -ne to compare integers, and reduce quoting This brings the rest of the regression test scripts in line with patch.sh.
diff | patch | tree
Commit:
3d42b2660156bfd71df40d11a996d7bf233ed2a4
From:
Josh Rickmar <jrick@zettaport.com>
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
diff | patch | tree
Commit:
41f061b2f459318f3738f59d7676efccc4beb344
From:
Stefan Sperling <stsp@stsp.name>
Date:
ignore unversioned files while aborting rebase, histedit, merge or operations ok jrick
diff | patch | tree
Commit:
1fa4907213af37d50029ee33b989867f41f0f124
From:
Stefan Sperling <stsp@stsp.name>
Date:
interrupt 'got rebase' upon missing/unversioned/not-deleted files
diff | patch | tree
Commit:
35ca1db76b33010a85a6d0e68e5d78d451028269
From:
Stefan Sperling <stsp@stsp.name>
Date:
print additional stats about things that went wrong during a merge
diff | patch | tree
Commit:
3a6b87604592c583079227ea995f50eb3ec74121
From:
Christian Weisgerber <naddy@mips.inka.de>
Date:
use the POSIX-compliant "date -u" command to return UTC time; ok stsp
diff | patch | tree