averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bc/stash-export-import'

Browse Source 
An interchange format for stash entries is defined, and subcommand
of "git stash" to import/export has been added.

* bc/stash-export-import:
  builtin/stash: provide a way to import stashes from a ref
  builtin/stash: provide a way to export stashes to a ref
  builtin/stash: factor out revision parsing into a function
  object-name: make get_oid quietly return an error
This commit is contained in:
Junio C Hamano
2025-06-30 14:30:30 -07:00
parent a013680162 bc303718cc
commit 91f10d7ca2
5 changed files with 584 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
object-name.c
View File

@@ -1081,13 +1081,17 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
* still fill in the oid with the "old" value,
* which we can use.
*/
} else {
} else if (!(flags & GET_OID_GENTLY)) {
if (flags & GET_OID_QUIETLY) {
exit(128);
}
die(_("log for '%.*s' only has %d entries"),
len, str, co_cnt);
}
if (flags & GET_OID_GENTLY) {
free(real_ref);
return -1;
}
}
}